Fix bugs overlooked when switching to URL