More fixes on portfolio