[[ RefactorSyntax ]] Fix Linux compilation/segfault issues