No relevant diff in that part so it should be fine.@AIAndy - this was a bit of a 'merge from hell' with CvInfos.cpp since you and I changed it concurrently. I think I preserved all your changes correctly but I'd appreciate if you'd diff the changes and check it looks ok to you in regard to your spawnInfo stuff.