Fixed issues with directory