Small fixes
merge fixes