Fix more errors :(