Fix ampersands
Merge branch 'fix-amp'