Back porting frozen String errors fix