Feedback build refs #2657

  fix issues