Minor fixes from Coverity output