Prepare for bug-fix of shorter strings.
Fix some issues with short strings.