Fix for glob situation, removal of shell injection