Fix auth and diversify