[Feature] Fix portal issues