Get rid of some errors