Fixed few logging