Fixing some error messages and comments