infernal fixes