jf: general fixes

Change-Id: I4d99c1de957471e2bde18cea2bfca12d833cdd79