some more fixes from 1.6.x