adding fixes

adding fixes