Minor bug fix in component populator