Fix waterall links, for real this time