cleaning up a bunch of warnings