Fixed small logging issues