Patches from Bart452 (THX)