[+BUGFIX] Service locator bugfixes