More fixes for URL problems. Should all be solved now.