Passthrough change and missed includes