Better mastersync detection