Dhm/bug ok serial numbers

@dianakhuang can you review and verify?