Minor updates after meeting with HP around some parameter settings.