[3546743] Fix component validation issues