Deb/fix 2.6 syntax and revert imports