Fix some breakage from merge that slipped through