Fix triggers.
Build improvements.