Fixing API annotations