Fixes for loading ships from XML