Fix issues raised during the code review