Fixing status codes