fix up jf-common

Change-Id: I5358a1729b52d004820613819db585b70c7446cc