more fixes for cl 5164