Fix up endpoints