A couple more improvements to Fidelity.m