Tmp file problems fixed, for now