Got rid of a bunch of warnings