Clean up some error messages