More /tmp/ vars and S/L fixes