Re: my fixes for 2.0 branch...