fix a FTBFS and fix one link