Corrected bugs in form types