Cleaned up build process to build cleanly on linux