Re: Various OSS fixes