Ampersand fixups