More shenanigans getting the initial dirs right...