more bug fixes
Merge branch 'ww3-feature/problem-sets-manager' into testing/ww3-upstream

* ww3-feature/problem-sets-manager:
  more bug fixes