fixes
merge fixes