C0103 fixes 5 - last c0103 changes

dependent PR