more various fixes
merge conflict fix