minor misc fixes