[FIX] Error codes: more error code fixes