Fix actions on remaining forms