Re: more misc fixes