Fixes for UpdateSerialNumber