fixes for triggers