Few small code review fixes.