more 0.10 compatibility changes