misc fixes from review