Remove 2.6 syntax errors