Fix API stuff