Fix computer inventory and entity mnagement. references #2175