Intelliactive tweaks

Change-Id: I77565fd0c865a64c63669f1c0ff4c650046704ce