Better treatment of Sor hardware bugs in testbed MAC