Fix and test deep hot swapping