Some fixed to the /tmp removal