adding fixes