Fixes remaining bugs on forms