Fix STRING_32 issues