Fix Dir spec and dir issue