minor patches during code review