More fixes for reading history afer Sierra migration