Fix some post version edge cases