Tweaked glob support