Minor fixes after changes in dispatcher