Fixed some forms bugs