Still fixing stupid links