Fixed function pipeline replacement infrastructure follow up