Fix issues with spaces.