Fix cli build