more misc fixes