Make sync requirements tighter