Add proper symlink resolution, remove caveat