More fixes. Updated Version 3.1.25.075