Fix synthesis issues