Portfolio fixes