More little changes to remove warns