small quick fixes after form.js refactoring