More fixes by @Tordek and by accident.