Pick up omnitruck integration fixups.