More Horde fixes