remove some errors and warnings