Fixes for XQ object