Change: more fixes