fix trigger compilation
Tweaks to try and help with time instability
Try and stop issue with System Time suddenly jumping forwards