More synthesis fixes