fix some files to improve performance