Fixed issues with interpreting directory locations