Fix bugs in form mixins