Fix for some odd sync issues