Fixing URL resolution