Finish up some 0.6.0 TODOs