Various small changes to the error module