Fix synch and creation bugs