Some bug fixes with endpoint location changes