Minor build changes for common service locator