Fix more negative calls