some fixes
hotfix