minor tweaks that came up when bulk testing for Beta shipping