Fix cpp check errors