Fixed some error messages in the application