More build improvements