2.6.9 + fixes