zs-3.2: Freebusy and other fixes along the way