Change-Id: I086964c6f6ce52c60c52b6dbc445d3c21d22c80a
Also fix some compile errors. I suspect this is dead code, but on the chance that it might be useful..... Change-Id: I0d56df88420ce484b72df626db4fadcebe04d777