Merge "Fixes strings"