misc fixes]