Update #7.3

More bugfixes.