Minor tweaks to support external programs