More minor tweaks
Squash "Failing row contains" errors.