Updates to make directory setup work, maybe.