Stability fixes from deployment testing.