Merge "Fix some compaction bugs in string allocation"