bug fixes from the testbed