Fixed rest of the warnings