new2: minor fixes