BUGFIX: Bugs with form submissions