Various fixes to clean up the error log

Clean up some of the error log issues I've seen.  These fixes should be harmless but I can't guarantee all of them will keep the logs clean but its a start.