Return better status codes