Update links and fixes after rebase