Cleaned up a bunch of warnings