Some fixes
Logging