Minor fixes from code review