Form fixes for events + a couple of settings changes