Updated changes that never got synced

Updated changes that never got committed.