fix errors from 4.2.2 merge