Make the dispatch table map better to windows' needs