more fixes in hotfix branch