Fixes for relational triggers (#2967)