Fixed forms bugs