A few robustness improvements

I had the shield wired up badly, and craziness ensued. This minor changes add a bit of robustness to behave better on failures.