Minor fixes after a code review