some quick patch fixups