Fix compilation environment a little