Minor mods to help with testing (again)