Fixed issues with globbing/splitting