Hotfix/various fixes