fix some of the logging issues