Fixed Portal issues.