-M port fix; and always print the specified target name when found