Remove warnings for O3S purposes