Fix a few issues around end points