Fixing all the warnings!