* Fixed some logging bugs