v9.15 unused warnings fixes