Adds the new live vs. triggered validation support
Fixing up the build