Merge "Fix several compiler warning"