Tweaks to CPPcheck