Fixed a few issues with logging.
That'll teach me to commit without testing