Sync with official ports