Fix ISM rate switching in JBM. Apply same fix to SBA and MC pre-emptively.