[2968] Fix some bad vehicle behaviors at XT002

Also fix the broken Freya achiev criteria from previous commits