fixes for code review