final 0.9 compatibility changes