Fixes bug in key generator
Fixes regressions in form designer