Fix issues with sync/editor