Some fixes for urls