More fixes found in testing