Fixed several portfolio issues