Commiting tweaks to logging for better reporting