Fix some 55c+ coverity issues