Fix  warnings