Fixed some Logging issues