XX-11294: - more precommit fixes