Fixes for dialogue and trigger.