NC solar bill clouded by Senate changes