Fixed issues with double directory separators