api cosmetic fixes