Fix bad calls