Fix more ampersand issues