Fixing some URL issues, still more to get fixed