Fix platform display in places where it was broken by ff8dfd43d86b.