Fix some links and some trims