Multiple fixes, and add of globing