fix some files from prior commits