miscellaneous fixes
merge resolution