Bug fixes from Chronicle 1.8