Fixed some more form / ability switches