Fix yet more warnings.