Fix more errors
Temporary fix