More URL fixes in metadata