Changes to the logging system to better unify logging