Fixing some URL resolution issues