small fixes
merge changes
fixes to build under clang++