Trying to fix all the warnings