Improve glob handling