Improved glob handling