Post merge fixes.