A few synthesis fixes