Form methods fix

Fixing multiple critical errors introduced by eb6bb3cbe447c94c3c8469dc59908bacc587b6c9.