Fix small python 2.6 compability issues.