Various fixes to bring in line with EAE
tmp dir