Fix for URL issues