Some synthesis fixes.