Re: a few make fixes