More pre-breach fixes.