More build flag changes