Add quotes around a few variables