Fixes to previous edits.