Some fixups for the empty component feature