Some minor improvements
Fix up branch divergence?