A couple of fixes to the newer endpoints.