2.5: more fixes