fixes for error messages