Fix minor bugs after component refactor.
Fix example config after component refactor.