Minor bugfixes
Merge branch 'master' of github.com:ostests/core