Fix more signatures