Continuing merge fixes.