More Forms fixes.

God, I’m really spamming these updates, aren’t I?