Fixed quoting in many places. Potential fix for [bug 1073 (#1073)] and [bug 992 (#992)]. Rev: server/start:1.186