Client fixes after more testing.