XD-2197 minor tweaks