Quick bug fixes for portfolio usage