Fix things after code review