Merge "Fix compiling warnings"