Fix for names with spaces, etc