Auto-mark caravan stuff and a few more random things.