Minor internal tweaks to the helper.
Some small changes to the custom component loader.

Signed-off-by: Oskar <oskar.warme@gmail.com>