updates for 0.10 compatibility