Fix some code review stuff