Merge "Fix compiler warnings."