Fixed more minor logging issues