Fix more warnings
Actually, that's not suppressing, that's changing behaviour