Various experimental fixes from the working tree

http://forum.xda-developers.com/showpost.php?p=26328597&postcount=20

Change-Id: I9520ee12e0876adf0e210864dab733ac650cd3cc