Small fixes to links and cms