Tidying up some relative URL schenanegans