REP-0140: correct errors and omissions found by reviewers