Various improvements to ola_trigger