Fix API_2_0 build