A few synthesis fixes
Some synthesis fixes