fix minor changes from 1.9.2