Hotfix/minor fixes