Got rid of some errors