a few more misc fixes