The main fix here is for AuthToken marshalling