CHG: removing warnings