coverity fixes

Why were we even doing this? @qpfiffer