More build script stuff