Fix CLI bootstrap