Bugfixes for Class Portfolio, Fixes #114