Add mechanisms for fixing urls