minor tweaks based on Portal enhancements