Fixed compile issue in XOP from recent changes