Fix CLI compilation errors