Updates to make the syncroable push work as expected