Latest portfolio fixes