Fixing issues with strings in AST