Doc fixes for 0.6 incoming