Fixes for Superuser (koush)

Change-Id: Ic36d72ebf4e1d3b6a7d48c639ebd785e49937acd