Links and fixes