Some more directory fixing...