Fix some cases where primaryTarget is assumed to be a ship