#393 - Fix additional admin component scans and bean definitions