Tackling Distribution Shift - Detection and Mitigation