Fixed some issues on forms