Whyyyy ? (also fixed some other sync issues)