More synthesis fixes.