Switch to new Superuser

Change-Id: I9d91392ad6fbc9953d19059ab59b91d214c00e0c
minor fixing