Fixed issue with validators changing without triggering signal
Fix some crufty logic