Fixes for null set of components and device components.