Minor fixes as well as preparation for allocating components in contiguous memory.