Fixes as per code review