More work on supporting service account auth, something's still broked
Few small cleanups