Loader and local_link fixed