OverlapKeeper fixes. #90