Fixes to log level and more logging