More fixes found by testing environment