Improve shell escaping