Fix some troll hell order issues