More checks, more OSes, more stuff...