XD-1575 minor tweaks