xpath start
Code review fixes