misc tweaks to use real temp-files