Fixes on form submit