minor fixes
merging fixes