Merge "Fix new compiler errors."