Update for 1.6_R3 compatibility