Fixed directory stuff