Fix some more troll hell inconsistencies