Fix how local and (hopefully) remote are served