jxc fbugs fixes

Change-Id: I7bdc5410d0b1ac1f909f9455b1f236484e9f69ad