small fixes to XY's last changes