Working on 2.5 fixes