Fixing build errors from sos-inject refactoring