Squash some truck production bugs