Multiple fixes relating to named/unnamed objects, spliting torpedos out.