A bunch of SIM_USIM fixes