Fix issue preventing machines with vstools 10 or 12 from building