Fix per code review comments