Minor form element changes