Add more generic tmp directory + fix in one command