Sync with ScummVM