more tweaks to deal with odd bugs