Cleaned up a lot of warning codes