Small fixes for single-portfolio