Updating some strong/weak references
More minor tweaks to sync-locking behavior.