Fixing some issues encountered with a German locale