Removed some of the warnings