Cleaned up a lot of warnings