Getting rid of some errors