s9s_sw_update fixes