Misc hotfix