Sync with online objects
Minor cleanup