a  few fix ...