More resiliency fixes