Adjusted Dispatcher spec, cleanup and fixes