Tweaks to XA Activator integration.