Offline fix and join order fix