Portal fixes