tweak forms for more consistency with other bundles