Fixing things up after breakage.