Fixing some hardcoded urls