Fix issue with spaces in image names.