Minor fixes to GridDispatch init and GridHandler match event