Fixed horrible problems with shell quoting