jf: general fixes

Change-Id: Ib520728e453e0167d44e74df2428b0517313f855
Merge pull request #3 from CyanogenMod/cm-10.1

jf: general fixes