Fix some problems with symbolic links