more tweaks to work with reformation