Handle some 2.4 v. 2.6 changes