Fixed activation issues