apply fix from code review and Vanessa last requests