Fix Build system broken by f561f2731340c1a7e8fe241c6f0ee9b9c22ba533
Lets try and get build system as self stand alone as possible