Fixed problem with earlier hotfix
Misc fixes
Misc fixes