fix different problems