Fixed more response codes