misc fixes (2)