Portal bugfixes