Minor Changes for XClops