cli build fixes