Fix API discrepancies