minor fixes from code review