fixes from internal code review