singlepath: various fixes