Slight improvements in endpoint and swift_process