Fix some endpoints

Let's try this again.....