fixes for code review 6-20-2013