[UNSTABLE] fixes in activators