Endpoint and swift process have minor bug fixes