0805 bug fixes. Testing Phase.