fix xxx issues