Minor fixes after code review