Adding fixes based on code review