Some fixes with urls