Fixup

four fixups that is setting in my local tree for sometime...