Updates to play nice with 0.6.0.