Update for 0.85 compatibility