Patches by McLive