Fix dealing with filenames containing spaces

and missing GestureRange require