Forms: typos, changed methods order