Cleared up all the warnings