0.90 compatibility changes
0.90 compatibility changes