fix errors found by review of 2.30