Fixed pickup subsystem references