some fixes for discuss with vitalets