Small fixes during code review