fix issues in advancing maize and wheat
Reviewer:Dan Jao
Issue: GCP-8812