Try to fix some of the build problems, it still bumms out on: