Minor syntax fixes
Prepare 2.6.0 release