Fix language CLI scripts for the latest changes to the base class