Fixed issues with relative paths