fixing 2.6 issues