Buxfixes from actual hardware interface testing.