Fixed some triggers