Update #7.5

Minor bugfixes