CS fixes by ongr-strict-standard