Fix for changed name of logger
Fixed compiler crashes in some cases