Fixed several warnings
merge