Minor fixes to JobToSwap, Loader and ChDevice