Fixed issues with symlinking