Links and checks fixes after review