Update for 0.9.16 compatibility