Fixed some small endpoint bounds