cosmetic previous merge related fixes.