Fixed  warnings