2.5 fixes
2.5 fixes
2.5: more additions/changes