fixed all remaining incompatibilities for 2.6, 2.7 and 3.3