Small fixes from the code review