Ticket #1800: minor enhancement and fix for mc.ext