inventory: Refs #2262 Fix OS and type count