Hopefully fix the worst bits.  Except bookmarks.