Fix regressions
Merge branch 'master' of https://github.com/gmatteo/pseudo_dojo