More build script fixes...grr.