minor fixes following code review