Fixes for merge compile problems.