Jactive fixes for real this time

Change-Id: Ie644d193c308c523e9916d575522d8843fbd75ba