Fix for building cli