HRCPP-27 Silence more warnings