MainThreadDispatcher fixes for issue #33