YossiP: code review fixes