fix some instances