Pull in some proper packages for gateways too