Breakout build fixes into seperate PR
Breakout build fixes into seperate PR

Netuitive/omnibus-netuitive-agent,Netuitive/omnibus-netuitive-agent,Netuitive/omnibus-netuitive-agent,Netuitive/omnibus-netuitive-agent