Added quoting of some variables