Make the return codes consistent