Tweaked PropertyTracker a bit