Weave bugfixes and fixes for persistence in Clocker