Fixes during code review