More endpoint polish