fixes for XY's changes