More fixes. Need the proper tester to continue.