Clean up warning messages a little