Fix more -Wignored-qualifiers warnings