Fixing hardcoded URLs