fixup merged changes..
misc: merge issues and fixes