Fixing URL bugs