Fixes for urls