Remove adminPass (it's not available in output), misc fixes.

Change-Id: I75911d5b1a751f7382b26bab5be1abb37d78bd03