Fixes for 0.6.0 interface changes