Re: Small make compatibility changes (take 2)