Fix errors in rate submit code path and make improvements.