Update and fix URLs