More codechecker fixes