Re: PATCH: temp fixes, again