Some codechecker fixes