mods to allow better operation across installations/machines