Fix some warnings with -Weverything
Fix more warnings