Merge "Fix compile warnings"