Fixes for fatal level when disabled - see release notes