XD-1615 Some more polishing