Bugfix: Various issues preventing imports and initialization of InternalRepository and ClientRepository.