Cleaned some of the warnings