fixes by  Jan Engelhardt