Fixed several warnings II