fix forms problems