Minor form updates