Minor cleanup
Add 2.6