Fixed  errors