Tiny Endpoint Fixes.