Re: Cross compile fix