Clean up log file tense, only use error/warning messages in more

extreme cases