Fixed a few 2.6 bugs