Fixed Logging issues