Small fixes implementing the code review