Fixes for folder names containing '