Changes to support 2.6