More minor repairs. ToB this time.