Non Window build

I only just ref old build fix.