Some more German fixes
Merge branch 'hotfix/berlin-edits'