follow up and fixing some leftovers for r38784