Moving some misc triggers out