Clean up error/warning messages for consistency