Fixing up endpoints