Fixes as per code review
Code review fixes