Fixed issues wit directries