[TASK] Adjust code to match new CType and prevent a few warnings