Minor modifications for the temp-directory stuff