#735: code review fixes