Fix Global BuildDispatcher
Cleanup with findglobals script
Update Minor