jf: Misc fixes

Change-Id: If6e45b80f9e1ab242283b10db8f6577dea29b910