1.9.x

minor fixes to 1.9.x branch