Fixes for move to tiny 4
Merge branch 'master' of github.com:PythonUnited/djinn_forms