More language fixes, unescaped ampersands