Further loki refinements courtesy of CyanogenMod

Change-Id: I6a3e7eb98c11cb27a78a61e6eaff1f1364445f4f