Multiple fixing, and refactoring error codes