Fix glob issues

As reported, this should fix the issues related with globbing