Fixed several warning