Some fixes
Merge branch 'dev' of github.com:tetrapods/core into dev