Resolve outstanding issues for 0.9.0 milestone