Updated to work with dependency fixes in autopickup.h