Minor fixes from code review comments