Additional fixes for a stability issue and improved chain reliability.