Fixes for portals