FIX: Build should now work on linux and osx