Final v0.8.x enhancements.