Bug fixes for AWE with auth.