cpychecker fixes