Merge "Fix compilation errors with gcc."