Fixed some more bugs with the portfolio manager