Continue fixing API problems