Core: Fix more warnings