fix some files for O/O2/O3