Fix some weird API things.