Update for compatibility with 2.6 and 2.7