Fix form designer save issues