API-CHANGES: cosmetic fixes