minor fixes to merge