Several fixes for recovery of Skyline