Merge to XFA: fix missing semicolons