Few fixes found in code review