(intend to) fix base url issues