Merge "Fix 2 compiler warnings."