Two fixes for coverity false-positives