Fix shell escaping into some commands