Fixes on linkings