d710: more fixes