Some fixes to portfolio