Fixes to polyglot code.