Logging fixes, wait for dictionary rebuild
New non-dynamic branch dependency
Cleanup