Fixing object reference issues
Fixing all live sync +acfortier