Fix trigger, handle alter table