Got rid of a lot of warnings