Fix more error 40's